from trunk
authorKenichi Handa <handa@m17n.org>
Sat, 16 Jan 2010 01:43:20 +0000 (10:43 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 16 Jan 2010 01:43:20 +0000 (10:43 +0900)

Trivial merge